From: l3thal <kwhite@gnu.org>
Date: Fri, 13 Nov 2015 21:37:26 +0000 (-0500)
Subject: Merge branch 'erc-async-reconnect' into emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~1616
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=51644c33d2e046b681646e2e07a636ba2fb234dc;p=emacs.git

Merge branch 'erc-async-reconnect' into emacs-25
---

51644c33d2e046b681646e2e07a636ba2fb234dc